Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #78

Merged
merged 79 commits into from
Dec 22, 2022
Merged

Develop #78

merged 79 commits into from
Dec 22, 2022

Conversation

krlosMata
Copy link
Contributor

develop --> main

invocamanman and others added 30 commits October 25, 2022 17:42
@invocamanman
first approach
63d32c1
@invocamanman
first approach
6fd905f
@invocamanman
following approach
9fcd965
@invocamanman
test remaining
0ab6698
@invocamanman
almost there
6ce297c
@invocamanman
assembly function
141f94f
@invocamanman
poe final test
09d8fe1
@invocamanman
finish at last
ba8e40e
@invocamanman
rebase changes
66fd49d
@invocamanman
update snark
fb4ef78
@invocamanman
PR fixes
ac9b40a
@invocamanman
update genesis
76f28a3
@invocamanman
Merge pull request #67 from 0xPolygonHermez/feature/addAribitraryData
6898f1c 
Feature/add aribitrary data
@invocamanman
support dai permit
abc5c94
@invocamanman
small refactor
d9a422a
@invocamanman
PR fixes
67acb19
@invocamanman
reduce -50k on getRoot
d2d5fdd
@invocamanman
update PoE
a1c1281
@krlosMata
Merge pull request #68 from 0xPolygonHermez/feature/supportDAiPermit
b2e4971 
Feature/support dai permit
@invocamanman
first approach
179493d
@invocamanman
add emergency state
e8c6344
@invocamanman
almost done
cc8e867
@invocamanman
at leeast
6781972
@invocamanman
now proofs works ^^
79f98d1
@krlosMata @invocamanman
fix rebase
ebe85a6
@invocamanman
rebase fixes
c70978d
@invocamanman
add create genesis script
3a866d9
@invocamanman
update commonjs
07d758a
@krlosMata
Merge pull request #69 from 0xPolygonHermez/feature/emergencyState
59388f7 
Add training wheels mechanisms
@invocamanman
update verifier
3e80ea1
invocamanman and others added 23 commits December 20, 2022 10:35
@invocamanman
update timelock
8fcf991
@invocamanman
update ZkEVM
38221da
@invocamanman
udpate dpeloyment and timelock test
5f438c3
@invocamanman
update deployment
04c9adc
@invocamanman
update genesis
43ed0c1
@invocamanman
should be last changes
c59a0ff
@invocamanman
comments carlos
539d631
@krlosMata
comments
e941686
@krlosMata
comments
c7e6e35
@krlosMata
comments
fc3f9a5
@krlosMata
review
1af034d
@invocamanman
Merge pull request #75 from 0xPolygonHermez/feature/comments-2
cd66591 
Feature/comments 2
@invocamanman
update hardhat config
9a841ee
@invocamanman
update tests with new errror names
cc7475c
@invocamanman
upgrade script
c328c7a
@invocamanman
timelock upgrade
8c78b1d
@krlosMata
Merge pull request #71 from 0xPolygonHermez/feature/securityMechanisms
9b853c5 
Feature/security mechanisms
@invocamanman
update package json
7b016f8
@krlosMata
Merge pull request #76 from 0xPolygonHermez/feature/updatePackageJson
abaf4de 
Feature/update package json
@invocamanman
last fixes
fb13a1b
@invocamanman
comments
15be36a
@invocamanman
mini fix
a0cf29e
@krlosMata
Merge pull request #77 from 0xPolygonHermez/feature/lastFixes
ce40865 
Feature/last fixes
@cla-bot cla-bot bot added the cla-signed label Dec 22, 2022
ignasirv
ignasirv approved these changes Dec 22, 2022
View reviewed changes
Copy link
Contributor

@ignasirv ignasirv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯 💯 💯

invocamanman
invocamanman approved these changes Dec 22, 2022
View reviewed changes
Copy link
Collaborator

@invocamanman invocamanman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^

@invocamanman invocamanman merged commit 5de59e1 into main Dec 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@invocamanman invocamanman invocamanman approved these changes

@ignasirv ignasirv ignasirv approved these changes

@laisolizq laisolizq Awaiting requested review from laisolizq

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@krlosMata @ignasirv @invocamanman